From 242f33092086b782efba5c7e0ec2c540616da751 Mon Sep 17 00:00:00 2001 From: Jan Arne Petersen Date: Sun, 25 May 2008 12:22:30 +0000 Subject: [PATCH] Ignore G_IO_ERROR_FAILED_HANDLED errors (#532262). 2008-05-25 Jan Arne Petersen * gtk/gtkfilechooserdefault.c: (shortcuts_activate_volume_mount_cb): Ignore G_IO_ERROR_FAILED_HANDLED errors (#532262). svn path=/trunk/; revision=20145 --- ChangeLog | 6 ++++++ gtk/gtkfilechooserdefault.c | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d496206f15..cfa0b4f4b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-25 Jan Arne Petersen + + * gtk/gtkfilechooserdefault.c: + (shortcuts_activate_volume_mount_cb): Ignore G_IO_ERROR_FAILED_HANDLED + errors (#532262). + 2008-05-25 Björn Lindqvist * tests/pixbuf-lowmem.c diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index ecb01d53ef..308cac669d 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -10346,12 +10346,15 @@ shortcuts_activate_volume_mount_cb (GtkFileSystemHandle *handle, if (error) { - char *msg; + if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED)) + { + char *msg; - msg = g_strdup_printf (_("Could not mount %s"), - gtk_file_system_volume_get_display_name (impl->file_system, volume)); - error_message (impl, msg, error->message); - g_free (msg); + msg = g_strdup_printf (_("Could not mount %s"), + gtk_file_system_volume_get_display_name (impl->file_system, volume)); + error_message (impl, msg, error->message); + g_free (msg); + } goto out; } -- 2.30.2